Fix and cleanup #303
Merged
Fix and cleanup #303
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ck as it will crash the playbook on other jumphosts due to hard-coded values for airlock, re-organised and grouped common role used by all cluster machines, so they are deployed in parallel for faster deployments, inserted ldap-server role in the right place, so roles that depend on regular accounts and groups being present do not crash, added missing subgroup_directories and fuse-layer roles for UIs, use sys-admin-interface host group instead of removed slurm-management host group.
…ck as it will crash the playbook on other jumphosts due to hard-coded values for airlock, re-organised and grouped common role used by all cluster machines, so they are deployed in parallel for faster deployments, inserted ldap-server role in the right place, so roles that depend on regular accounts and groups being present do not crash, added missing subgroup_directories and fuse-layer roles for UIs, use sys-admin-interface host group instead of removed slurm-management host group.
…tent SSH connection.
…otocol to make it a real URI and remove hardcoded ldap:// or ldaps:// in various places, removed ldaps_uri variable, create private and primary groups for the home dirs of LDAP users just like for local users and fixed wrong local users/groups created on Hyperchicken that were conflicting with with LDAP entries.
pneerincx
requested review from
erijpkema,
Gerbenvandervries,
marieke-bijlsma,
mheijkoop and
rasmanen
…heck rule 701 related to Ansible Galaxy, which we do not use.
…e-role-playbooks subdir, so role can find the keys for the CA key pairs for ssh-host-key-signing.
| @@ -10,7 +10,7 @@ ExecStartPre=-/usr/bin/docker kill %n | |||
| ExecStartPre=-/usr/bin/docker rm %n | |||
| ExecStartPre=/usr/bin/docker pull osixia/phpldapadmin:0.7.2 | |||
| ExecStart=/usr/bin/docker run -i --name %n --network host \ | |||
| --env PHPLDAPADMIN_LDAP_HOSTS={{ uri_ldap }} \ | |||
| --env PHPLDAPADMIN_LDAP_HOSTS={{ ldap_uri | regex_replace('^ldaps?://','')}} \ | |||
There was a problem hiding this comment.
Not sure, but shouldn't this be "ldap" instead of "ldaps" in the regex pattern?
There was a problem hiding this comment.
The ? after the s from ldaps in the regex means match zero or one time, so the regex will match both ldap:// as well as ldaps:// and we do not need separate ldap_uri and ldaps_uri variables anymore: just ldap_uri is enough and can use both plain and encrypted ldap traffic.
There was a problem hiding this comment.
Ok, thanks for the explanation :-)
marieke-bijlsma
approved these changes
Aug 10, 2020
This was referenced Aug 10, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tested:
main
cluster.ymlplay runs all the way from start until the end :)Changes:
spacewalk_clientrole idempotent.geerlingguy.postfixdependency that is no longer used.slurm-managementhost group; usesys-admin-interfaceinstead for slurm-management role as well as various monitoring roles all of which are deployed on SAIs.README.mdfor static inventories that got relocated to a subdir some time ago.cluster.ymlplaybook:before trying to connect to the machines behind the jumphost,
which may otherwise fail when connection multiplexing is used.
grafany-proxyonairlockas it will crash the playbook on other jumphosts due to hard-coded values forairlockldap-serverrole in the right place, so roles that depend on regular accounts and groups being present do not crashsubgroup_directoriesandfuse-layerroles for UIs.ldap_urivariable,so it is a real URI and we do not need hardcoded protocols in plays anymore.
just like for local users and make this private groups the primary group of a user.
openldaprole.